Change in openvpn[release/2.6]: Ensure that all unit tests use unbuffered stdout and stderr
A message that is not in the archive (sent off-list or not yet received): gerrit.1767876064000.I5c06dc13e9d8ab73997f79b13c30ee8949e5e993@...2715...
Attention is currently required from: cron2.
flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email )
Change subject: Ensure that all unit tests use unbuffered stdout and stderr
......................................................................
Ensure that all unit tests use unbuffered stdout and stderr
stderr is normally always unbuffered but stdout can be buffered. Especially, when stdout is redirected it will become buffered while it is normally unbuffered when connected to a terminal. This mean that if the unit exits prematurely, the output in the buffered output will be lost.
As the unit test x_msg mock implementation prints even fatal on stdout we ensure with this setup method that stdout is also unbuffered.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28122.html
---
M tests/unit_tests/openvpn/test_argv.c
M tests/unit_tests/openvpn/test_auth_token.c
M tests/unit_tests/openvpn/test_buffer.c
A tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_crypto.c
M tests/unit_tests/openvpn/test_cryptoapi.c
M tests/unit_tests/openvpn/test_misc.c
M tests/unit_tests/openvpn/test_ncp.c
M tests/unit_tests/openvpn/test_packet_id.c
M tests/unit_tests/openvpn/test_pkt.c
M tests/unit_tests/openvpn/test_provider.c
M tests/unit_tests/openvpn/test_tls_crypt.c
12 files changed, 63 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/61/1461/1
tests/unit_tests/openvpn/test_argv.c +2 -0
@@ -12,6 +12,7 @@#include "argv.h" #include "buffer.h" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */ #define PATH1 "/s p a c e"
@@ -252,6 +253,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
tests/unit_tests/openvpn/test_auth_token.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "auth_token.c" +#include "test_common.h" struct test_context {struct tls_multi multi;
@@ -407,6 +408,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test_setup_teardown (auth_token_basic_test, setup, teardown),cmocka_unit_test_setup_teardown (auth_token_fail_invalid_key, setup, teardown),
tests/unit_tests/openvpn/test_buffer.c +2 -0
@@ -32,6 +32,7 @@#include "buffer.h" #include "buffer.c" +#include "test_common.h" static void test_buffer_strprefix (void **state)
@@ -369,6 +370,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test(test_buffer_strprefix), cmocka_unit_test_setup_teardown(test_buffer_list_aggregate_separator_empty,
tests/unit_tests/openvpn/test_common.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* OpenVPN -- An application to securely tunnel IP networks +* over a single UDP port, with support for SSL/TLS-based +* session authentication and key exchange, +* packet encryption, packet authentication, and +* packet compression. +* +* Copyright (C) 2016-2021 Fox Crypto B.V. <[email protected]...> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <stdio.h> +#include <setjmp.h> +#include <cmocka.h> + +/** +* Sets up the environment for unit tests like making both stderr and stdout +* non-buffered to avoid messages getting lost if the program exits early. +* +* This has a openvpn prefix to avoid confusion with cmocka's unit_test_setup_* +* methods +*/ +void +openvpn_unit_test_setup () +{ +assert_int_equal (setvbuf (stdout,NULL , _IONBF,BUFSIZ ),0 ); +assert_int_equal (setvbuf (stderr,NULL , _IONBF,BUFSIZ ),0 ); +}
tests/unit_tests/openvpn/test_crypto.c +2 -0
@@ -39,6 +39,7 @@#include "ssl_backend.h" #include "mss.h" +#include "test_common.h" static const char testtext[] ="Dummy text to test PEM encoding" ;
@@ -479,6 +480,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (crypto_pem_encode_decode_loopback),cmocka_unit_test (crypto_translate_cipher_names),
tests/unit_tests/openvpn/test_cryptoapi.c +2 -0
@@ -40,6 +40,7 @@#include <openssl/core_names.h> #include <openssl/evp.h> #include <openssl/pkcs12.h> +#include "test_common.h" #include <cryptoapi.h> #include <cryptoapi.c> /* pull-in the whole file to test static functions */
@@ -582,6 +583,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_parse_hexstring),cmocka_unit_test (import_certs),
tests/unit_tests/openvpn/test_misc.c +2 -0
@@ -36,6 +36,7 @@#include "ssl_util.h" #include "options_util.h" +#include "test_common.h" static void test_compat_lzo_string (void **state)
@@ -117,5 +118,6 @@int main (void ) { +openvpn_unit_test_setup ();return cmocka_run_group_tests (misc_tests,NULL ,NULL ); }
tests/unit_tests/openvpn/test_ncp.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "ssl_ncp.c" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */
@@ -272,6 +273,7 @@int main (void ) { +openvpn_unit_test_setup ();#if defined(ENABLE_CRYPTO_OPENSSL )OpenSSL_add_all_algorithms ();#endif
tests/unit_tests/openvpn/test_packet_id.c +2 -0
@@ -35,6 +35,7 @@#include "packet_id.h" #include "reliable.h" +#include "test_common.h" struct test_packet_id_write_data { struct {
@@ -273,6 +274,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(test_packet_id_write_short, test_packet_id_write_setup,
tests/unit_tests/openvpn/test_pkt.c +2 -0
@@ -33,6 +33,7 @@#include <string.h> #include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "crypto.h" #include "options.h"
@@ -778,6 +779,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_verify_hmac_none),cmocka_unit_test (test_tls_decrypt_lite_none),
tests/unit_tests/openvpn/test_provider.c +3 -0
@@ -40,6 +40,8 @@#include <openssl/core_names.h> #include <openssl/evp.h> +#include "test_common.h" +struct management *management;/* global */ static int mgmt_callback_called;
@@ -119,6 +121,7 @@static void init_test () { +openvpn_unit_test_setup (); prov[0 ] =OSSL_PROVIDER_load (NULL ,"default" );OSSL_PROVIDER_add_builtin (NULL , prov_name, xkey_provider_init); prov[1 ] =OSSL_PROVIDER_load (NULL , prov_name);
tests/unit_tests/openvpn/test_tls_crypt.c +2 -0
@@ -34,6 +34,7 @@#include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "tls_crypt.c" /* Define this function here as dummy since including the ssl_*.c files
@@ -673,6 +674,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(tls_crypt_loopback, test_tls_crypt_setup,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
Gerrit-Change-Number: 1461
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Attention is currently required from: flichtenheld.
cron2 has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email )
Change subject: Ensure that all unit tests use unbuffered stdout and stderr
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
Gerrit-Change-Number: 1461
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 15 Jan 2026 08:26:54 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH 1/1 Ensure that all unit tests use unbuffered stdout and stderr
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
stderr is normally always unbuffered but stdout can be buffered. Especially, when stdout is redirected it will become buffered while it is normally unbuffered when connected to a terminal. This mean that if the unit exits prematurely, the output in the buffered output will be lost.
As the unit test x_msg mock implementation prints even fatal on stdout we ensure with this setup method that stdout is also unbuffered.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28122.html
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1461
(cherry picked from commit 7869617a0f85089fb5e6fbe2db6f03542a8f33f4)
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1461
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
tests/unit_tests/openvpn/test_argv.c +2 -0
@@ -12,6 +12,7 @@#include "argv.h" #include "buffer.h" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */ #define PATH1 "/s p a c e"
@@ -252,6 +253,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
tests/unit_tests/openvpn/test_auth_token.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "auth_token.c" +#include "test_common.h" struct test_context {struct tls_multi multi;
@@ -407,6 +408,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test_setup_teardown (auth_token_basic_test, setup, teardown),cmocka_unit_test_setup_teardown (auth_token_fail_invalid_key, setup, teardown),
tests/unit_tests/openvpn/test_buffer.c +2 -0
@@ -32,6 +32,7 @@#include "buffer.h" #include "buffer.c" +#include "test_common.h" static void test_buffer_strprefix (void **state)
@@ -369,6 +370,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test(test_buffer_strprefix), cmocka_unit_test_setup_teardown(test_buffer_list_aggregate_separator_empty,
tests/unit_tests/openvpn/test_common.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* OpenVPN -- An application to securely tunnel IP networks +* over a single UDP port, with support for SSL/TLS-based +* session authentication and key exchange, +* packet encryption, packet authentication, and +* packet compression. +* +* Copyright (C) 2016-2021 Fox Crypto B.V. <[email protected]...> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <stdio.h> +#include <setjmp.h> +#include <cmocka.h> + +/** +* Sets up the environment for unit tests like making both stderr and stdout +* non-buffered to avoid messages getting lost if the program exits early. +* +* This has a openvpn prefix to avoid confusion with cmocka's unit_test_setup_* +* methods +*/ +void +openvpn_unit_test_setup () +{ +assert_int_equal (setvbuf (stdout,NULL , _IONBF,BUFSIZ ),0 ); +assert_int_equal (setvbuf (stderr,NULL , _IONBF,BUFSIZ ),0 ); +}
tests/unit_tests/openvpn/test_crypto.c +2 -0
@@ -39,6 +39,7 @@#include "ssl_backend.h" #include "mss.h" +#include "test_common.h" static const char testtext[] ="Dummy text to test PEM encoding" ;
@@ -479,6 +480,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (crypto_pem_encode_decode_loopback),cmocka_unit_test (crypto_translate_cipher_names),
tests/unit_tests/openvpn/test_cryptoapi.c +2 -0
@@ -40,6 +40,7 @@#include <openssl/core_names.h> #include <openssl/evp.h> #include <openssl/pkcs12.h> +#include "test_common.h" #include <cryptoapi.h> #include <cryptoapi.c> /* pull-in the whole file to test static functions */
@@ -582,6 +583,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_parse_hexstring),cmocka_unit_test (import_certs),
tests/unit_tests/openvpn/test_misc.c +2 -0
@@ -36,6 +36,7 @@#include "ssl_util.h" #include "options_util.h" +#include "test_common.h" static void test_compat_lzo_string (void **state)
@@ -117,5 +118,6 @@int main (void ) { +openvpn_unit_test_setup ();return cmocka_run_group_tests (misc_tests,NULL ,NULL ); }
tests/unit_tests/openvpn/test_ncp.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "ssl_ncp.c" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */
@@ -272,6 +273,7 @@int main (void ) { +openvpn_unit_test_setup ();#if defined(ENABLE_CRYPTO_OPENSSL )OpenSSL_add_all_algorithms ();#endif
tests/unit_tests/openvpn/test_packet_id.c +2 -0
@@ -35,6 +35,7 @@#include "packet_id.h" #include "reliable.h" +#include "test_common.h" struct test_packet_id_write_data { struct {
@@ -273,6 +274,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(test_packet_id_write_short, test_packet_id_write_setup,
tests/unit_tests/openvpn/test_pkt.c +2 -0
@@ -33,6 +33,7 @@#include <string.h> #include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "crypto.h" #include "options.h"
@@ -778,6 +779,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_verify_hmac_none),cmocka_unit_test (test_tls_decrypt_lite_none),
tests/unit_tests/openvpn/test_provider.c +3 -0
@@ -40,6 +40,8 @@#include <openssl/core_names.h> #include <openssl/evp.h> +#include "test_common.h" +struct management *management;/* global */ static int mgmt_callback_called;
@@ -119,6 +121,7 @@static void init_test () { +openvpn_unit_test_setup (); prov[0 ] =OSSL_PROVIDER_load (NULL ,"default" );OSSL_PROVIDER_add_builtin (NULL , prov_name, xkey_provider_init); prov[1 ] =OSSL_PROVIDER_load (NULL , prov_name);
tests/unit_tests/openvpn/test_tls_crypt.c +2 -0
@@ -34,6 +34,7 @@#include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "tls_crypt.c" /* Define this function here as dummy since including the ssl_*.c files
@@ -673,6 +674,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(tls_crypt_loopback, test_tls_crypt_setup,
[Openvpn-devel] [PATCH applied] Re: Ensure that all unit tests use unbuffered stdout and stderr
This and the next patch are necessary backports to make unit tests in 2.6 more useful again - "show us the actual error" and "compile with -Werror and libcmocka 2.0". So thanks :-)
As it's cherrypicks, the change is fairly straightforward. The commit message has both the old and the new mailing list reference.
Your patch has been applied to the release/2.6 branch.
commit be76565f44a85bf4f7804049209fe23b4d4ae10a
Author: Arne Schwabe Date: Thu Jan 15 09:28:01 2026 +0100
Ensure that all unit tests use unbuffered stdout and stderr
Acked-by: Frank Lichtenheld <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28122.html
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1461
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35272.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: Ensure that all unit tests use unbuffered stdout and stderr
......................................................................
Ensure that all unit tests use unbuffered stdout and stderr
stderr is normally always unbuffered but stdout can be buffered. Especially, when stdout is redirected it will become buffered while it is normally unbuffered when connected to a terminal. This mean that if the unit exits prematurely, the output in the buffered output will be lost.
As the unit test x_msg mock implementation prints even fatal on stdout we ensure with this setup method that stdout is also unbuffered.
Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
URL: https://www.mail-archive.com/[email protected]/msg28122.html
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1461
(cherry picked from commit 7869617a0f85089fb5e6fbe2db6f03542a8f33f4)
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35272.html
---
M tests/unit_tests/openvpn/test_argv.c
M tests/unit_tests/openvpn/test_auth_token.c
M tests/unit_tests/openvpn/test_buffer.c
A tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_crypto.c
M tests/unit_tests/openvpn/test_cryptoapi.c
M tests/unit_tests/openvpn/test_misc.c
M tests/unit_tests/openvpn/test_ncp.c
M tests/unit_tests/openvpn/test_packet_id.c
M tests/unit_tests/openvpn/test_pkt.c
M tests/unit_tests/openvpn/test_provider.c
M tests/unit_tests/openvpn/test_tls_crypt.c
12 files changed, 63 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/61/1461/2
tests/unit_tests/openvpn/test_argv.c +2 -0
@@ -12,6 +12,7 @@#include "argv.h" #include "buffer.h" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */ #define PATH1 "/s p a c e"
@@ -252,6 +253,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
tests/unit_tests/openvpn/test_auth_token.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "auth_token.c" +#include "test_common.h" struct test_context {struct tls_multi multi;
@@ -407,6 +408,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test_setup_teardown (auth_token_basic_test, setup, teardown),cmocka_unit_test_setup_teardown (auth_token_fail_invalid_key, setup, teardown),
tests/unit_tests/openvpn/test_buffer.c +2 -0
@@ -32,6 +32,7 @@#include "buffer.h" #include "buffer.c" +#include "test_common.h" static void test_buffer_strprefix (void **state)
@@ -369,6 +370,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test(test_buffer_strprefix), cmocka_unit_test_setup_teardown(test_buffer_list_aggregate_separator_empty,
tests/unit_tests/openvpn/test_common.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* OpenVPN -- An application to securely tunnel IP networks +* over a single UDP port, with support for SSL/TLS-based +* session authentication and key exchange, +* packet encryption, packet authentication, and +* packet compression. +* +* Copyright (C) 2016-2021 Fox Crypto B.V. <[email protected]...> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <stdio.h> +#include <setjmp.h> +#include <cmocka.h> + +/** +* Sets up the environment for unit tests like making both stderr and stdout +* non-buffered to avoid messages getting lost if the program exits early. +* +* This has a openvpn prefix to avoid confusion with cmocka's unit_test_setup_* +* methods +*/ +void +openvpn_unit_test_setup () +{ +assert_int_equal (setvbuf (stdout,NULL , _IONBF,BUFSIZ ),0 ); +assert_int_equal (setvbuf (stderr,NULL , _IONBF,BUFSIZ ),0 ); +}
tests/unit_tests/openvpn/test_crypto.c +2 -0
@@ -39,6 +39,7 @@#include "ssl_backend.h" #include "mss.h" +#include "test_common.h" static const char testtext[] ="Dummy text to test PEM encoding" ;
@@ -479,6 +480,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (crypto_pem_encode_decode_loopback),cmocka_unit_test (crypto_translate_cipher_names),
tests/unit_tests/openvpn/test_cryptoapi.c +2 -0
@@ -40,6 +40,7 @@#include <openssl/core_names.h> #include <openssl/evp.h> #include <openssl/pkcs12.h> +#include "test_common.h" #include <cryptoapi.h> #include <cryptoapi.c> /* pull-in the whole file to test static functions */
@@ -582,6 +583,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_parse_hexstring),cmocka_unit_test (import_certs),
tests/unit_tests/openvpn/test_misc.c +2 -0
@@ -36,6 +36,7 @@#include "ssl_util.h" #include "options_util.h" +#include "test_common.h" static void test_compat_lzo_string (void **state)
@@ -117,5 +118,6 @@int main (void ) { +openvpn_unit_test_setup ();return cmocka_run_group_tests (misc_tests,NULL ,NULL ); }
tests/unit_tests/openvpn/test_ncp.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "ssl_ncp.c" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */
@@ -272,6 +273,7 @@int main (void ) { +openvpn_unit_test_setup ();#if defined(ENABLE_CRYPTO_OPENSSL )OpenSSL_add_all_algorithms ();#endif
tests/unit_tests/openvpn/test_packet_id.c +2 -0
@@ -35,6 +35,7 @@#include "packet_id.h" #include "reliable.h" +#include "test_common.h" struct test_packet_id_write_data { struct {
@@ -273,6 +274,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(test_packet_id_write_short, test_packet_id_write_setup,
tests/unit_tests/openvpn/test_pkt.c +2 -0
@@ -33,6 +33,7 @@#include <string.h> #include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "crypto.h" #include "options.h"
@@ -778,6 +779,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_verify_hmac_none),cmocka_unit_test (test_tls_decrypt_lite_none),
tests/unit_tests/openvpn/test_provider.c +3 -0
@@ -40,6 +40,8 @@#include <openssl/core_names.h> #include <openssl/evp.h> +#include "test_common.h" +struct management *management;/* global */ static int mgmt_callback_called;
@@ -119,6 +121,7 @@static void init_test () { +openvpn_unit_test_setup (); prov[0 ] =OSSL_PROVIDER_load (NULL ,"default" );OSSL_PROVIDER_add_builtin (NULL , prov_name, xkey_provider_init); prov[1 ] =OSSL_PROVIDER_load (NULL , prov_name);
tests/unit_tests/openvpn/test_tls_crypt.c +2 -0
@@ -34,6 +34,7 @@#include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "tls_crypt.c" /* Define this function here as dummy since including the ssl_*.c files
@@ -673,6 +674,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(tls_crypt_loopback, test_tls_crypt_setup,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
Gerrit-Change-Number: 1461
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: plaisthos <[email protected]...>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email )
Change subject: Ensure that all unit tests use unbuffered stdout and stderr
......................................................................
Ensure that all unit tests use unbuffered stdout and stderr
stderr is normally always unbuffered but stdout can be buffered. Especially, when stdout is redirected it will become buffered while it is normally unbuffered when connected to a terminal. This mean that if the unit exits prematurely, the output in the buffered output will be lost.
As the unit test x_msg mock implementation prints even fatal on stdout we ensure with this setup method that stdout is also unbuffered.
Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
URL: https://www.mail-archive.com/[email protected]/msg28122.html
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1461
(cherry picked from commit 7869617a0f85089fb5e6fbe2db6f03542a8f33f4)
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35272.html
---
M tests/unit_tests/openvpn/test_argv.c
M tests/unit_tests/openvpn/test_auth_token.c
M tests/unit_tests/openvpn/test_buffer.c
A tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_crypto.c
M tests/unit_tests/openvpn/test_cryptoapi.c
M tests/unit_tests/openvpn/test_misc.c
M tests/unit_tests/openvpn/test_ncp.c
M tests/unit_tests/openvpn/test_packet_id.c
M tests/unit_tests/openvpn/test_pkt.c
M tests/unit_tests/openvpn/test_provider.c
M tests/unit_tests/openvpn/test_tls_crypt.c
12 files changed, 63 insertions(+), 0 deletions(-)
tests/unit_tests/openvpn/test_argv.c +2 -0
@@ -12,6 +12,7 @@#include "argv.h" #include "buffer.h" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */ #define PATH1 "/s p a c e"
@@ -252,6 +253,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
tests/unit_tests/openvpn/test_auth_token.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "auth_token.c" +#include "test_common.h" struct test_context {struct tls_multi multi;
@@ -407,6 +408,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test_setup_teardown (auth_token_basic_test, setup, teardown),cmocka_unit_test_setup_teardown (auth_token_fail_invalid_key, setup, teardown),
tests/unit_tests/openvpn/test_buffer.c +2 -0
@@ -32,6 +32,7 @@#include "buffer.h" #include "buffer.c" +#include "test_common.h" static void test_buffer_strprefix (void **state)
@@ -369,6 +370,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test(test_buffer_strprefix), cmocka_unit_test_setup_teardown(test_buffer_list_aggregate_separator_empty,
tests/unit_tests/openvpn/test_common.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* OpenVPN -- An application to securely tunnel IP networks +* over a single UDP port, with support for SSL/TLS-based +* session authentication and key exchange, +* packet encryption, packet authentication, and +* packet compression. +* +* Copyright (C) 2016-2021 Fox Crypto B.V. <[email protected]...> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <stdio.h> +#include <setjmp.h> +#include <cmocka.h> + +/** +* Sets up the environment for unit tests like making both stderr and stdout +* non-buffered to avoid messages getting lost if the program exits early. +* +* This has a openvpn prefix to avoid confusion with cmocka's unit_test_setup_* +* methods +*/ +void +openvpn_unit_test_setup () +{ +assert_int_equal (setvbuf (stdout,NULL , _IONBF,BUFSIZ ),0 ); +assert_int_equal (setvbuf (stderr,NULL , _IONBF,BUFSIZ ),0 ); +}
tests/unit_tests/openvpn/test_crypto.c +2 -0
@@ -39,6 +39,7 @@#include "ssl_backend.h" #include "mss.h" +#include "test_common.h" static const char testtext[] ="Dummy text to test PEM encoding" ;
@@ -479,6 +480,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (crypto_pem_encode_decode_loopback),cmocka_unit_test (crypto_translate_cipher_names),
tests/unit_tests/openvpn/test_cryptoapi.c +2 -0
@@ -40,6 +40,7 @@#include <openssl/core_names.h> #include <openssl/evp.h> #include <openssl/pkcs12.h> +#include "test_common.h" #include <cryptoapi.h> #include <cryptoapi.c> /* pull-in the whole file to test static functions */
@@ -582,6 +583,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_parse_hexstring),cmocka_unit_test (import_certs),
tests/unit_tests/openvpn/test_misc.c +2 -0
@@ -36,6 +36,7 @@#include "ssl_util.h" #include "options_util.h" +#include "test_common.h" static void test_compat_lzo_string (void **state)
@@ -117,5 +118,6 @@int main (void ) { +openvpn_unit_test_setup ();return cmocka_run_group_tests (misc_tests,NULL ,NULL ); }
tests/unit_tests/openvpn/test_ncp.c +2 -0
@@ -35,6 +35,7 @@#include <cmocka.h> #include "ssl_ncp.c" +#include "test_common.h" /* Defines for use in the tests and the mock parse_line() */
@@ -272,6 +273,7 @@int main (void ) { +openvpn_unit_test_setup ();#if defined(ENABLE_CRYPTO_OPENSSL )OpenSSL_add_all_algorithms ();#endif
tests/unit_tests/openvpn/test_packet_id.c +2 -0
@@ -35,6 +35,7 @@#include "packet_id.h" #include "reliable.h" +#include "test_common.h" struct test_packet_id_write_data { struct {
@@ -273,6 +274,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(test_packet_id_write_short, test_packet_id_write_setup,
tests/unit_tests/openvpn/test_pkt.c +2 -0
@@ -33,6 +33,7 @@#include <string.h> #include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "crypto.h" #include "options.h"
@@ -778,6 +779,7 @@int main (void ) { +openvpn_unit_test_setup ();const struct CMUnitTest tests[] = {cmocka_unit_test (test_verify_hmac_none),cmocka_unit_test (test_tls_decrypt_lite_none),
tests/unit_tests/openvpn/test_provider.c +3 -0
@@ -40,6 +40,8 @@#include <openssl/core_names.h> #include <openssl/evp.h> +#include "test_common.h" +struct management *management;/* global */ static int mgmt_callback_called;
@@ -119,6 +121,7 @@static void init_test () { +openvpn_unit_test_setup (); prov[0 ] =OSSL_PROVIDER_load (NULL ,"default" );OSSL_PROVIDER_add_builtin (NULL , prov_name, xkey_provider_init); prov[1 ] =OSSL_PROVIDER_load (NULL , prov_name);
tests/unit_tests/openvpn/test_tls_crypt.c +2 -0
@@ -34,6 +34,7 @@#include <setjmp.h> #include <cmocka.h> +#include "test_common.h" #include "tls_crypt.c" /* Define this function here as dummy since including the ssl_*.c files
@@ -673,6 +674,7 @@ int main(void) { + openvpn_unit_test_setup(); const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(tls_crypt_loopback, test_tls_crypt_setup,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1461?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I5c06dc13e9d8ab73997f79b13c30ee8949e5e993
Gerrit-Change-Number: 1461
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: plaisthos <[email protected]...>